luci-app-attendedsysupgrade: add target in reuqest

The updated ASU api requires `target` within reuqests since the
`profile` or `board_name` is never truely unique. This is especially a
problem for x86 devices which mostly use `generic` as profile name.

Signed-off-by: Paul Spooren <[email protected]>

diff --git a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
index a46bb3db4473035482051c806765b4a3c4083524..cbb0b9a778c5d0b8454c2481f0ad0c5307d3f15e 100644 (file)
--- a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
+++ b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
@@ -77,6 +77,7 @@ function request_sysupgrade(server_url, data) {
        } else {
                req = request.post(server_url + "/api/build", {
                        profile: data.board_name,
+                       target: data.target,
                        version: data.version,
                        packages: data.packages,
                        diff_packages: true,
@@ -213,7 +214,7 @@ function request_sysupgrade(server_url, data) {
        });
 }
 
-function check_sysupgrade(server_url, current_version, board_name, packages) {
+function check_sysupgrade(server_url, current_version, target, board_name, packages) {
        displayStatus("notice spinning", E('p', _('Searching for an available sysupgrade')));
        var current_branch = current_version.split(".").slice(0, 2).join(".");
        var candidates = [];
@@ -253,6 +254,7 @@ function check_sysupgrade(server_url, current_version, board_name, packages) {
                                var mapdata = {
                                        request: {
                                                board_name: board_name,
+                                               target: target,
                                                version: candidates[0],
                                                packages: Object.keys(packages).sort(),
                                        }
@@ -339,6 +341,7 @@ return view.extend({
        render: function(res) {
                var packages = res[0].packages;
                var current_version = res[1].release.version;
+               var target = res[1].release.target;
                var board_name = res[1].board_name;
                var auto_search = uci.get_first('attendedsysupgrade', 'client', 'auto_search') || 1;
                var server_url = uci.get_first('attendedsysupgrade', 'server', 'url');
@@ -350,13 +353,13 @@ return view.extend({
                ];
 
                if (auto_search == 1) {
-                       check_sysupgrade(server_url, current_version, board_name, packages)
+                       check_sysupgrade(server_url, current_version, target, board_name, packages)
                }
 
                view.push(E('p', {
                        'class': 'btn cbi-button-positive',
                        'click': function() {
-                               check_sysupgrade(server_url, current_version, board_name, packages)
+                               check_sysupgrade(server_url, current_version, target, board_name, packages)
                        }
                }, _('Search for sysupgrade')));